* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
authorGlenn Morris <rgm@gnu.org>
Tue, 10 Apr 2012 17:27:01 +0000 (13:27 -0400)
committerGlenn Morris <rgm@gnu.org>
Tue, 10 Apr 2012 17:27:01 +0000 (13:27 -0400)
commitec42591ea259dbbb1878e78d1865b5640b90dc84
treef17789ddc2083f309b14c7e10f0be897acbdf236
parent6c4d68195ab55625e8543398e66e15513d87a821
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
Add header keyword.
admin/ChangeLog
admin/bzrmerge.el